Remove obsolete translator comments

Reported in bug 611217

diff --git a/gtk/gen-paper-names.c b/gtk/gen-paper-names.c
index b4541eff01723de34e37b6522fa6fb41310d5d8d..30626963ce74ce4af92b3d7ca5ceb508b6e8bf69 100644 (file)
--- a/gtk/gen-paper-names.c
+++ b/gtk/gen-paper-names.c
@@ -8,7 +8,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
@@ -60,7 +60,7 @@ find_name (const gchar *name)
   for (i = 0; i < n_names; i++)
     {
       if (strcmp (names[i].s, name) == 0)
-       return names[i].offset;
+        return names[i].offset;
     }
 
   fprintf (stderr, "BOO! %s not found\n", name);
@@ -73,8 +73,8 @@ find_name (const gchar *name)
 
 static gboolean
 parse_media_size (const gchar *size,
-                 gdouble     *width_mm, 
-                 gdouble     *height_mm)
+                  gdouble     *width_mm, 
+                  gdouble     *height_mm)
 {
   const gchar *p;
   gchar *e;
@@ -127,7 +127,7 @@ main (int argc, char *argv[])
       add_name (standard_names[i].name);
       add_name (standard_names[i].display_name);
       if (standard_names[i].ppd_name)
-       add_name (standard_names[i].ppd_name);
+        add_name (standard_names[i].ppd_name);
     }
 
   for (i = 0; i < n_extra; i++)
@@ -140,51 +140,50 @@ main (int argc, char *argv[])
   for (i = 0; i < n_names; i++)
     for (j = 0; j < n_names; j++)
       {
-       if (i == j) continue;
-       
-       if (names[i].len < names[j].len ||
-           (names[i].len == names[j].len && j < i))
-         {
-           if (strcmp (names[i].s, names[j].s + names[j].len - names[i].len) == 0)
-             {
-               names[i].suffix = j;
-               break;
-             }
-         }
+        if (i == j) continue;
+
+        if (names[i].len < names[j].len ||
+            (names[i].len == names[j].len && j < i))
+          {
+            if (strcmp (names[i].s, names[j].s + names[j].len - names[i].len) == 0)
+              {
+                names[i].suffix = j;
+                break;
+              }
+          }
       }
-  
+
   /* calculate offsets for regular entries */
   offset = 0;
   for (i = 0; i < n_names; i++)
     {
       if (names[i].suffix == -1)
-       {
-         names[i].offset = offset;
-         offset += names[i].len + 1;
-       }
+        {
+          names[i].offset = offset;
+          offset += names[i].len + 1;
+        }
     }
-  
+
   /* calculate offsets for suffixes */
   for (i = 0; i < n_names; i++)
     {
       if (names[i].suffix != -1)
-       {
-         j = i;
-         do {
-           j = names[j].suffix;
-         } while (names[j].suffix != -1);
-         names[i].offset = names[j].offset + names[j].len - names[i].len;
-       }
+        {
+          j = i;
+          do {
+            j = names[j].suffix;
+          } while (names[j].suffix != -1);
+          names[i].offset = names[j].offset + names[j].len - names[i].len;
+        }
     }
-    
+
   printf ("/* Generated by gen-paper-names */\n\n");
 
   /* write N_ marked names */
 
   printf ("#if 0\n");
   for (i = 0; i < n_infos; i++)
-    printf ("/* translators, strip everything up to the first | */\n"
-           "NC_(\"paper size\", \"%s\")\n", standard_names[i].display_name);
+    printf ("NC_(\"paper size\", \"%s\")\n", standard_names[i].display_name);
   printf ("#endif\n\n");
 
   /* write strings */
@@ -192,50 +191,50 @@ main (int argc, char *argv[])
   for (i = 0; i < n_names; i++)
     {
       if (names[i].suffix == -1)
-       printf ("\n  \"%s\\0\"", names[i].s);
+        printf ("\n  \"%s\\0\"", names[i].s);
     }
   printf (";\n\n");
 
   /* dump PaperInfo array */
   printf ("typedef struct {\n"
-         "  int name;\n"
-         "  float width;\n"
+          "  int name;\n"
+          "  float width;\n"
           "  float height;\n"
-         "  int display_name;\n"
-         "  int ppd_name;\n"
-         "} PaperInfo;\n\n"
+          "  int display_name;\n"
+          "  int ppd_name;\n"
+          "} PaperInfo;\n\n"
           "static const PaperInfo standard_names_offsets[] = {\n");
 
   for (i = 0; i < n_infos; i++)
     {
       width = height = 0.0;
       if (!parse_media_size (standard_names[i].size, &width, &height))
-       printf ("failed to parse size %s\n", standard_names[i].size);
+        printf ("failed to parse size %s\n", standard_names[i].size);
 
-      printf ("  { %4d, %g, %g, %4d, %4d },\n", 
-             find_name (standard_names[i].name),
-             width, height,
-             find_name (standard_names[i].display_name),
-             find_name (standard_names[i].ppd_name));
+      printf ("  { %4d, %g, %g, %4d, %4d },\n",
+              find_name (standard_names[i].name),
+              width, height,
+              find_name (standard_names[i].display_name),
+              find_name (standard_names[i].ppd_name));
     }
-  
+
   printf ("};\n\n");
 
 
   /* dump extras */
 
   printf ("static const struct {\n"
-         "  int ppd_name;\n"
-         "  int standard_name;\n"
-         "} extra_ppd_names_offsets[] = {\n");
+          "  int ppd_name;\n"
+          "  int standard_name;\n"
+          "} extra_ppd_names_offsets[] = {\n");
 
   for (i = 0; i < n_extra; i++)
     {
-      printf ("  { %4d, %4d },\n", 
-             find_name (extra_ppd_names[i].ppd_name),
-             find_name (extra_ppd_names[i].standard_name));
+      printf ("  { %4d, %4d },\n",
+              find_name (extra_ppd_names[i].ppd_name),
+              find_name (extra_ppd_names[i].standard_name));
     }
-  
+
   printf ("};\n\n");
 
   return 0;

diff --git a/gtk/paper_names_offsets.c b/gtk/paper_names_offsets.c
index f0414742196d739500a767d44568471aec768947..dfb97883c945c67279452a64da8d14a9c54e0ffc 100644 (file)
--- a/gtk/paper_names_offsets.c
+++ b/gtk/paper_names_offsets.c
@@ -1,335 +1,170 @@
 /* Generated by gen-paper-names */
 
 #if 0
-/* translators, strip everything up to the first | */
 NC_("paper size", "asme_f")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A0x2")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A0")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A0x3")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A1")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A10")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A1x3")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A1x4")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A2")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A2x3")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A2x4")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A2x5")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A3")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A3 Extra")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A3x3")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A3x4")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A3x5")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A3x6")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A3x7")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A4")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A4 Extra")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A4 Tab")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A4x3")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A4x4")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A4x5")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A4x6")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A4x7")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A4x8")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A4x9")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A5")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A5 Extra")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A6")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A7")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A8")
-/* translators, strip everything up to the first | */
 NC_("paper size", "A9")
-/* translators, strip everything up to the first | */
 NC_("paper size", "B0")
-/* translators, strip everything up to the first | */
 NC_("paper size", "B1")
-/* translators, strip everything up to the first | */
 NC_("paper size", "B10")
-/* translators, strip everything up to the first | */
 NC_("paper size", "B2")
-/* translators, strip everything up to the first | */
 NC_("paper size", "B3")
-/* translators, strip everything up to the first | */
 NC_("paper size", "B4")
-/* translators, strip everything up to the first | */
 NC_("paper size", "B5")
-/* translators, strip everything up to the first | */
 NC_("paper size", "B5 Extra")
-/* translators, strip everything up to the first | */
 NC_("paper size", "B6")
-/* translators, strip everything up to the first | */
 NC_("paper size", "B6/C4")
-/* translators, strip everything up to the first | */
 NC_("paper size", "B7")
-/* translators, strip everything up to the first | */
 NC_("paper size", "B8")
-/* translators, strip everything up to the first | */
 NC_("paper size", "B9")
-/* translators, strip everything up to the first | */
 NC_("paper size", "C0")
-/* translators, strip everything up to the first | */
 NC_("paper size", "C1")
-/* translators, strip everything up to the first | */
 NC_("paper size", "C10")
-/* translators, strip everything up to the first | */
 NC_("paper size", "C2")
-/* translators, strip everything up to the first | */
 NC_("paper size", "C3")
-/* translators, strip everything up to the first | */
 NC_("paper size", "C4")
-/* translators, strip everything up to the first | */
 NC_("paper size", "C5")
-/* translators, strip everything up to the first | */
 NC_("paper size", "C6")
-/* translators, strip everything up to the first | */
 NC_("paper size", "C6/C5")
-/* translators, strip everything up to the first | */
 NC_("paper size", "C7")
-/* translators, strip everything up to the first | */
 NC_("paper size", "C7/C6")
-/* translators, strip everything up to the first | */
 NC_("paper size", "C8")
-/* translators, strip everything up to the first | */
 NC_("paper size", "C9")
-/* translators, strip everything up to the first | */
 NC_("paper size", "DL Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "RA0")
-/* translators, strip everything up to the first | */
 NC_("paper size", "RA1")
-/* translators, strip everything up to the first | */
 NC_("paper size", "RA2")
-/* translators, strip everything up to the first | */
 NC_("paper size", "SRA0")
-/* translators, strip everything up to the first | */
 NC_("paper size", "SRA1")
-/* translators, strip everything up to the first | */
 NC_("paper size", "SRA2")
-/* translators, strip everything up to the first | */
 NC_("paper size", "JB0")
-/* translators, strip everything up to the first | */
 NC_("paper size", "JB1")
-/* translators, strip everything up to the first | */
 NC_("paper size", "JB10")
-/* translators, strip everything up to the first | */
 NC_("paper size", "JB2")
-/* translators, strip everything up to the first | */
 NC_("paper size", "JB3")
-/* translators, strip everything up to the first | */
 NC_("paper size", "JB4")
-/* translators, strip everything up to the first | */
 NC_("paper size", "JB5")
-/* translators, strip everything up to the first | */
 NC_("paper size", "JB6")
-/* translators, strip everything up to the first | */
 NC_("paper size", "JB7")
-/* translators, strip everything up to the first | */
 NC_("paper size", "JB8")
-/* translators, strip everything up to the first | */
 NC_("paper size", "JB9")
-/* translators, strip everything up to the first | */
 NC_("paper size", "jis exec")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Choukei 2 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Choukei 3 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Choukei 4 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "hagaki (postcard)")
-/* translators, strip everything up to the first | */
 NC_("paper size", "kahu Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "kaku2 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "oufuku (reply postcard)")
-/* translators, strip everything up to the first | */
 NC_("paper size", "you4 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "10x11")
-/* translators, strip everything up to the first | */
 NC_("paper size", "10x13")
-/* translators, strip everything up to the first | */
 NC_("paper size", "10x14")
-/* translators, strip everything up to the first | */
 NC_("paper size", "10x15")
-/* translators, strip everything up to the first | */
 NC_("paper size", "10x15")
-/* translators, strip everything up to the first | */
 NC_("paper size", "11x12")
-/* translators, strip everything up to the first | */
 NC_("paper size", "11x15")
-/* translators, strip everything up to the first | */
 NC_("paper size", "12x19")
-/* translators, strip everything up to the first | */
 NC_("paper size", "5x7")
-/* translators, strip everything up to the first | */
 NC_("paper size", "6x9 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "7x9 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "9x11 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "a2 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Arch A")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Arch B")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Arch C")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Arch D")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Arch E")
-/* translators, strip everything up to the first | */
 NC_("paper size", "b-plus")
-/* translators, strip everything up to the first | */
 NC_("paper size", "c")
-/* translators, strip everything up to the first | */
 NC_("paper size", "c5 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "d")
-/* translators, strip everything up to the first | */
 NC_("paper size", "e")
-/* translators, strip everything up to the first | */
 NC_("paper size", "edp")
-/* translators, strip everything up to the first | */
 NC_("paper size", "European edp")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Executive")
-/* translators, strip everything up to the first | */
 NC_("paper size", "f")
-/* translators, strip everything up to the first | */
 NC_("paper size", "FanFold European")
-/* translators, strip everything up to the first | */
 NC_("paper size", "FanFold US")
-/* translators, strip everything up to the first | */
 NC_("paper size", "FanFold German Legal")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Government Legal")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Government Letter")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Index 3x5")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Index 4x6 (postcard)")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Index 4x6 ext")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Index 5x8")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Invoice")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Tabloid")
-/* translators, strip everything up to the first | */
 NC_("paper size", "US Legal")
-/* translators, strip everything up to the first | */
 NC_("paper size", "US Legal Extra")
-/* translators, strip everything up to the first | */
 NC_("paper size", "US Letter")
-/* translators, strip everything up to the first | */
 NC_("paper size", "US Letter Extra")
-/* translators, strip everything up to the first | */
 NC_("paper size", "US Letter Plus")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Monarch Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "#10 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "#11 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "#12 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "#14 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "#9 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Personal Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Quarto")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Super A")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Super B")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Wide Format")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Dai-pa-kai")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Folio")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Folio sp")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Invite Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Italian Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "juuro-ku-kai")
-/* translators, strip everything up to the first | */
 NC_("paper size", "pa-kai")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Postfix Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "Small Photo")
-/* translators, strip everything up to the first | */
 NC_("paper size", "prc1 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "prc10 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "prc 16k")
-/* translators, strip everything up to the first | */
 NC_("paper size", "prc2 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "prc3 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "prc 32k")
-/* translators, strip everything up to the first | */
 NC_("paper size", "prc4 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "prc5 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "prc6 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "prc7 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "prc8 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "prc9 Envelope")
-/* translators, strip everything up to the first | */
 NC_("paper size", "ROC 16k")
-/* translators, strip everything up to the first | */
 NC_("paper size", "ROC 8k")
 #endif